Cast to 32-bit integers when premultiplying, suggested by Keith Packard.

2004-07-28  Anders Carlsson  <andersca@gnome.org>

	* gdk/x11/gdkdrawable-x11.c (gdk_draw_rectangle_alpha_libgtk_only):
	Cast to 32-bit integers when premultiplying, suggested by Keith Packard.

diff --git a/ChangeLog b/ChangeLog
index 674df53c033935902244008a9e552326dbfe4ecc..5de00219cac544dbf9847965489e9204b9d3a4f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-28  Anders Carlsson  <andersca@gnome.org>
+
+       * gdk/x11/gdkdrawable-x11.c (gdk_draw_rectangle_alpha_libgtk_only): 
+       Cast to 32-bit integers when premultiplying, suggested by Keith Packard.
+
 2004-07-27  Anders Carlsson  <andersca@gnome.org>
 
        * demos/gtk-demo/iconview.c: (do_iconview):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 674df53c033935902244008a9e552326dbfe4ecc..5de00219cac544dbf9847965489e9204b9d3a4f5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-07-28  Anders Carlsson  <andersca@gnome.org>
+
+       * gdk/x11/gdkdrawable-x11.c (gdk_draw_rectangle_alpha_libgtk_only): 
+       Cast to 32-bit integers when premultiplying, suggested by Keith Packard.
+
 2004-07-27  Anders Carlsson  <andersca@gnome.org>
 
        * demos/gtk-demo/iconview.c: (do_iconview):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 674df53c033935902244008a9e552326dbfe4ecc..5de00219cac544dbf9847965489e9204b9d3a4f5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-07-28  Anders Carlsson  <andersca@gnome.org>
+
+       * gdk/x11/gdkdrawable-x11.c (gdk_draw_rectangle_alpha_libgtk_only): 
+       Cast to 32-bit integers when premultiplying, suggested by Keith Packard.
+
 2004-07-27  Anders Carlsson  <andersca@gnome.org>
 
        * demos/gtk-demo/iconview.c: (do_iconview):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 674df53c033935902244008a9e552326dbfe4ecc..5de00219cac544dbf9847965489e9204b9d3a4f5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-07-28  Anders Carlsson  <andersca@gnome.org>
+
+       * gdk/x11/gdkdrawable-x11.c (gdk_draw_rectangle_alpha_libgtk_only): 
+       Cast to 32-bit integers when premultiplying, suggested by Keith Packard.
+
 2004-07-27  Anders Carlsson  <andersca@gnome.org>
 
        * demos/gtk-demo/iconview.c: (do_iconview):

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 7d27a48e8ab9b65d97146e8a873e6135c832bad5..1247b45ea80e5669559dfb9647cbd634644fbe43 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -1511,9 +1511,9 @@ gdk_draw_rectangle_alpha_libgtk_only (GdkDrawable  *drawable,
   xdisplay = GDK_DISPLAY_XDISPLAY (gdk_drawable_get_display (drawable));
 
   render_color.alpha = alpha;
-  render_color.red = color->red * render_color.alpha / 0xffff;
-  render_color.green = color->green * render_color.alpha / 0xffff;
-  render_color.blue = color->blue * render_color.alpha / 0xffff;
+  render_color.red = (guint32)color->red * render_color.alpha / 0xffff;
+  render_color.green = (guint32)color->green * render_color.alpha / 0xffff;
+  render_color.blue = (guint32)color->blue * render_color.alpha / 0xffff;
 
   XRenderFillRectangle (xdisplay,
                        PictOpOver, pict, &render_color,